From: Chong Yidong Date: Fri, 7 Dec 2012 16:25:28 +0000 (+0800) Subject: * subr.el (text-clone-maintain): Fix clone overlay deletion X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~9^2~14 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=454eb09524ef6e8c25ea7dc8b9fd6fadb0bb1a5c;p=emacs.git * subr.el (text-clone-maintain): Fix clone overlay deletion when a syntax is specified. Fixes: debbugs:13025 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ee551879577..ab351f2a69c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2012-12-07 Chong Yidong + * subr.el (text-clone-maintain): Fix clone overlay deletion when a + syntax is specified (Bug#13025). + * info.el (Info-set-mode-line): Remove the file extension from Info-current-file if there is one (Bug#13016). diff --git a/lisp/subr.el b/lisp/subr.el index edc2927d673..e08277370a9 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -3847,7 +3847,7 @@ This is used on the `modification-hooks' property of text clones." (if (not (re-search-forward (overlay-get ol1 'text-clone-syntax) cend t)) ;; Mark the overlay for deletion. - (overlay-put ol1 'text-clones nil) + (setq end cbeg) (when (< (match-end 0) cend) ;; Shrink the clone at its end. (setq end (min end (match-end 0)))